wayland: copy wayland.xml to SYSROOT #9741
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
heitbaum
requested changes
Feb 4, 2025
There was a problem hiding this comment.
Also needs a change to vulkan-tools
BUILD vulkan-tools (target)
TOOLCHAIN cmake (auto-detect)
Executing (target): cmake -GNinja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_TOOLCHAIN_FILE=/var/media/DATA/home-rudi/LibreELEC.tv/build.LibreELEC-wayland.x86_64-13.0-devel/toolchain/etc/cmake-x86_64-libreelec-linux-gnu.conf -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DVULKAN_HEADERS_INSTALL_DIR=/var/media/DATA/home-rudi/LibreELEC.tv/build.LibreELEC-wayland.x86_64-13.0-devel/toolchain/x86_64-libreelec-linux-gnu/sysroot/usr -DBUILD_VULKANINFO=ON -DBUILD_ICD=OFF -DBUILD_WSI_DIRECTFB_SUPPORT=OFF -DPython3_EXECUTABLE=/var/media/DATA/home-rudi/LibreELEC.tv/build.LibreELEC-wayland.x86_64-13.0-devel/toolchain/bin/python3 -Wno-dev -DBUILD_CUBE=ON -DCOMPILE_CUBE_SHADERS=ON -DBUILD_WSI_XCB_SUPPORT=OFF -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_WAYLAND_SUPPORT=ON
-DCUBE_WSI_SELECTION=WAYLAND /var/media/DATA/home-rudi/LibreELEC.tv/build.LibreELEC-wayland.x86_64-13.0-devel/build/vulkan-tools-1.4.307
Package wayland-protocols was not found in the pkg-config search path.
Perhaps you should add the directory containing `wayland-protocols.pc'
to the PKG_CONFIG_PATH environment variable
No package 'wayland-protocols' found
-- Configuring done (0.1s)
CMake Error in cube/CMakeLists.txt:
Cannot find source file:
/stable/xdg-shell/xdg-shell.xml
Tried extensions .c .C .c++ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm
.ccm .cxxm .c++m .h .hh .h++ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90
.f95 .f03 .hip .ispc
CMake Error in cube/CMakeLists.txt:
Cannot find source file:
/unstable/xdg-decoration/xdg-decoration-unstable-v1.xml
Tried extensions .c .C .c++ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm
.ccm .cxxm .c++m .h .hh .h++ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90
.f95 .f03 .hip .ispc
-- Generating done (0.0s)
CMake Generate step failed. Build files cannot be regenerated correctly.
diff --git a/packages/graphics/vulkan/vulkan-tools/package.mk b/packages/graphics/vulkan/vulkan-tools/package.mk
index dd3d14105d..a0d2a7734b 100644
--- a/packages/graphics/vulkan/vulkan-tools/package.mk
+++ b/packages/graphics/vulkan/vulkan-tools/package.mk
@@ -16,7 +16,7 @@ configure_package() {
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_DEPENDS_TARGET+=" libxcb libX11"
elif [ "${DISPLAYSERVER}" = "wl" ]; then
- PKG_DEPENDS_TARGET+=" wayland"
+ PKG_DEPENDS_TARGET+=" wayland wayland-protocols"
fi
}
vulkan-tools requires wayland.xml when building wayland target with
vulkan support. when wayland.xml is missing, build of vulkan-tools fails
with following error:
CMake Error in cube/CMakeLists.txt:
Cannot find source file:
[...]/toolchain/x86_64-libreelec-linux-gnu/sysroot/usr/share/wayland/wayland.xml
Tried extensions .c .C .c++ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm
.ccm .cxxm .c++m .h .hh .h++ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90
.f95 .f03 .hip .ispc
also wayland-protocols is needed by the vulkan-tools package as per
testing by @heitbaum.
heitbaum
approved these changes
Feb 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
vulkan-tools requires wayland.xml when building wayland target with vulkan support. when wayland.xml is missing, build of vulkan-tools fails with following error: